Merge remote-tracking branch 'origin/harfbuzz'

author Eli Zaretskii <eliz@gnu.org>

Fri, 7 Jun 2019 14:52:16 +0000 (17:52 +0300)

committer Eli Zaretskii <eliz@gnu.org>

Fri, 7 Jun 2019 14:52:16 +0000 (17:52 +0300)
author Eli Zaretskii <eliz@gnu.org>
Fri, 7 Jun 2019 14:52:16 +0000 (17:52 +0300)
committer Eli Zaretskii <eliz@gnu.org>
Fri, 7 Jun 2019 14:52:16 +0000 (17:52 +0300)
diff --cc etc/HELLO
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/language/ind-util.el
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Eli Zaretskii <eliz@gnu.org>
	Fri, 7 Jun 2019 14:52:16 +0000 (17:52 +0300)
committer	Eli Zaretskii <eliz@gnu.org>
	Fri, 7 Jun 2019 14:52:16 +0000 (17:52 +0300)
		1	2
etc/HELLO	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/language/ind-util.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history